Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Thu, 20 May 2010 13:29:53 +0000 (13:29 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Thu, 20 May 2010 13:29:53 +0000 (13:29 +0000)
commitfeeb9c6f5c7822413bd77d23145bf2053073270f
tree2083a5d7890af605cdd4b5167037b3c7dc3534ca
parentacd98002ca417c2a4e1ff4d9896b9dc55cb10342
parentacd35ce6a908a63dbf2af6e157635ad9a573cf83
Merge from mainline.